Merge pull request #59 from kraftery/master

happy easter everyone