Merge pull request #30 from themiron/master