Fix merge conflicts
Merge pull request #1 from Nea88/v0.2

V0.2