raslab booboo.
Merge branch 'master' of https://github.com/peteramayer/PMALabs

cause we still need that stuff.