Merge pull request #54 from spincrisis/patch-1