Merge pull request #5 from meetmagdalene/master

merge to master