Merge pull request #1 from Bekjarce/master

Merge
Merge pull request #3 from NickJord/master

Merge pull request #1 from Bekjarce/master