Merge pull request #28 from eswierk/master

Various fixes and improvements