Merge pull request #1 from Nipheon/master

pull latest changes from nipheon
made it a little hübscher
Merge pull request #4 from RSchul2/master

made it a little hübscher