Merge pull request #36 from ZomgPonies/master

Merge Update