Merge pull request #115 from jwien001/master

Resolving merge conflicts