Merge pull request #2 from funvill/master

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

Fixed the problems with the merge.