Merge pull request #7 from LeSpocky/master

current state