Merge current develop version to master

This current develop version should solve #1, #2, #3.
Please test this and if it works please merge to master and deploy.

See merge request !1