dev-fixes #27

Closed
lopar wants to merge 12 commits from dev-fixes into dev
No description provided.