Fixed issue #110
Fixed issue #111
Fixed issue #112
Merge branch 'master' of github.com:minnal/minnal