#93 - Related fixes and improvements.
Merge branch 'master' of https://github.com/boonex/dolphin