Confirmed
Fixed merge conflict
Merge pull request #8 from Sh4rkus/reviewQuestion

Confirmed