Fixed merge conflict.
Merge pull request #6 from gotoplanb/master

Fixed merge conflicts.