Merge pull request #16 from Trevoke/dev

Dev
Merge pull request #22 from Trevoke/dev

Fixes #19, possibly fixes #20
Merge pull request #23 from Trevoke/dev

Converted piggy demo area to suitable format and integrated it into demo...