Merge branch 'devel'

* Beta release
* Smoothed contours
* Adjusted design
* Workaround for build on Linux
README.md
Merge branch 'master' into devel

Update to 1.004