Merge pull request #59 from kraftery/master

happy easter everyone
Merge pull request #60 from kraftery/NewNewDavid

Merge pull request #59 from kraftery/master