Cleanup
Merge branch 'master' of github.com:doberman/dbrmn-hipmap
Merge branch 'master' of github.com:doberman/dbrmn-hipmap
Merge branch 'master' of github.com:doberman/dbrmn-hipmap