#1 - Minor fixes and improvements.
#94 - remove temporary fix.
#24 - Fixes and improvements.
Merge branch 'master' of https://github.com/boonex/dolphin