Merge pull request #4 from Gurr3/dev

Merge pull request #3 from Gurr3/master
Merge pull request #5 from Gurr3/master

Merge pull request #4 from Gurr3/dev