Merge pull request #43 from DariusIII/master

master to dev
Merge pull request #44 from DariusIII/dev

Dev