closes #38
Merge branch 'master' of git://github.com/TheAlbatross279/Gustafo