Merge with threaded-application + switch to new version 0.2.0