Use std::call_once
Merge branch 'master' of github.com:Constellation/iv