Merge pull request #33 from themiron/master