minor changes
merge conflict fixes
Merge pull request #28 from jpsiepert/master

Minor Stuff