ASPP/pelita — pull request #77 by esc (2012-05-01 17:56:52+00:00)
Title: Review/nchiapol/master pr65

Rebased version of #65

+1 for cleaner historty