Incorporate changes from several pull requests
Merge pull request #52 from ckuehl/updates20140801

Incorporate changes from several pull requests