Merge pull request #31 from eswierk/master

Various changes