fix conflict
Merge pull request #31 from chunterg/master

fix conflict