Merge pull request #16 from blackwithwhite666/master

Some minor changes