added pleyto's code + cleaned it up a bit
Merge branch 'dev' of https://github.com/MitchelCabuloy/Potator into dev