Merge pull request #62 from marcusball/master