Fix #34.
Merge branch 'master' into st3