Merge pull request #46 from stargieg/master