Fixed conflict.
Merge pull request #36 from iuj/master

Fixed conflict.