Merge pull request #4 from Cheesebaron/master

Merge up