fixed a merge conflict and removed unnecessary debug statement
Merge pull request #14 from ajy/master

fixed a merge conflict and removed unnecessary debug statement