p2t2/figaro — pull request #146 by bruttenberg (2014-04-04 21:05:00+00:00)
Title: Dev2.2 Merge

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