Merge pull request #18 from danny0838/master

Several simple fixes