Incorporate changes from several pull requests
Merge pull request #53 from ckuehl/updates20140805

Incorporate changes from several pull requests