sync
Merge remote-tracking branch 'origin/master'
simpler and safer constructors for calc and X + one reset_inc function