#69 cleanSession flag feature

Merge feature-cleanSession branch