Merge pull request #6 from PurpleKangaroo/master

merge