fixed merge conflict
Merge pull request #19 from CTFigueroa/master

fixed merge conflict