Merge branch 'master' into 'master'

This commit fixes issues: #30, #31, #32, #33 (partially), #37, #38, #39, #40, #41, #42

See merge request !14