Impl commit. ref #110
Merge branch 'master' into commit