Answered the dmap question
merge again
Merge branch 'master' of github.com:kaar/liu
Fixed conflict