Merge pull request #9 from Snowstormer/master

ok
shtuff
Merge pull request #10 from Snowstormer/development

Development