Fixing merge conflicts
Merge pull request #1 from minond/master

Fixing merge conflicts