Dev2.2

Fix for #192 and #193