Merge pull request #29 from eswierk/master

Various fixes and improvements