Merge pull request #458 from kAworu/master

Various fixes and improvements