Fixing #18.
Merge branch 'stable' into experimental