pre-merge commit from acer-quantal
Merge branch 'master' of https://github.com/ozymandium/estimation

merge c++ changes made on acer-quantal with branch continued on Vette