Merge branch 'develop' of https://github.com/andrenho/newhope into develop