prepare for deploy
Merge pull request #9 from Hendrixer/dev

prepare for deploy
Merge pull request #10 from Blazur/dev

Dev