Merge pull request #1 from JoshsBoard/master

updating
some changes
Merge pull request #18 from joshuaruesweg/master

some changes