Merge pull request #13 from myd7349/master

Some small fixes