Dev2.2 Merge

Fixes issues #135, #130, #129 and #127