Map reading and fixed #62