Merge pull request #9 from bwross/master

Some minor fixes
Merge pull request #10 from bwross/master

Merge HTTP interface fix