planned v1.1.1; update source to "normal" C++