Merge pull request #33 from eswierk/master

More changes