Implemented new map format. Closes #4.