Resolve conflict
Merge pull request #7 from reekoheek/master

Resolve conflict