merged
Merge pull request #49 from akezeke/Frodo_b2

sync with Frodo beta 2
Merge pull request #51 from akezeke/Frodo_rc1

Frodo rc1
More merge