Fixed bad merge
Merge pull request #13 from paulsapps/master

Fixed bad merge