Merge pull request #54 from shimaore/patch-1