Porting johnronk@1ec7c61 to Pistachitos and exposing via gui
Merge pull request #760 from WebSpider/Pistachitos

Porting johnronk@1ec7c61 to Pistachitos and exposing via gui