Implemented map handler. Minor fixes. Close #3