Merge pull request #3 from samebchase/patch-1