Merge ext-wide feature branch

Close #227
Close #246