Merge pull request #4 from LeSpocky/master

current state of v2.0