buggfix n shizz
Merge branch 'master' of https://github.com/tEFFx/piggy