Dev2.2

Partial fix for #172.