Merge pull request #112 from pakozm/devel

Devel, new version incomming, v0.4.0