Fixed #116.
Merge branch 'dev-0.06' into experimental