Fork from POP-C++ (try to integrate coherence, C++11 features, my ideas)