Partial.
Merge branch 'issue12'