Merge pull request #2 from Bekjarce/master

Merge pull request #3 from NickJord/master
Merge pull request #4 from NickJord/master

Merge pull request #2 from Bekjarce/master