Solves #24.
Solves #24 and more.
Merge branch 'master' into dev_#24
Merge branch 'dev_#24'