Fixing merge conflicts.
Merge pull request #83 from Mobius5150/master

Fixing merge conflicts.