Merge pull request #62 from Ysnir/master

V0.0.1A1