Fixed failed merging (removed "<<<<<<< HEAD" and ">>>>>>> upstream/pre-master" lines)
Merge pull request #10 from pnuu/pre-master

Fixed failed merging. Thanks Pnuu.