Merge pull request #3 from TheBoolean/master