Merge pull request #11 from Hendrixer/dev

Dev
Merge branch 'dev' of https://github.com/Blazur/blazur into dev
build