Merge pull request #7 from PurpleKangaroo/master

merge