Merge pull request #45 from themiron/master