Last changes proposed by Florian
Merge branch 'master' of https://github.com/rohanramanath/frontier-framework