some code cleanup
Merge remote-tracking branch 'origin/ribbons' into ribbons
Merge remote-tracking branch 'origin/ribbons' into ribbons
fixed race condition in issue #100
disabled demo maps see #96
removed unnecessary log info
Merge remote-tracking branch 'origin/ribbons' into ribbons