Merge pull request #24 from themiron/master