Merge pull request #4 from ZomgPonies/master

Merge from master