Fixing merge problems
Merge pull request #2 from funvill/master

Fixing merge problems