working map, fixes #15