Merge pull request #89 from pakozm/devel

Pull of v0.4.0 into master