Merge branch 'master' into devel
Merge branch 'master' into devel
Fixed bug in distribution
Merge pull request #10 from robrwo/devel

Fixed bug in distro