Merge pull request #53 from hansenerd/master