mozzwald Merge pull request #4 from mckayemu/master