Merge pull request #1 from jakiestfu/master

Sync Fork
Merge pull request #79 from morgante/master

Merge pull request #1 from jakiestfu/master