Merge branch 'feat011-city' of https://github.com/andrenho/newhope into feat011-city
wip