Merge pull request #15 from blackwithwhite666/master

Some minor changes