This commit includes fixes and improvements for previous commit by
Ondřej Kuzník - thanks for contribution!

Fixes: #95