Fixed Issue #107.
Merge branch 'dev-0.06' into experimental