Merge pull request #11 from Jay1/master

Some minor fixes