Killer update
Merge branch 'master' of github.com:creckx/pcp
Merge branch 'master' of github.com:creckx/pcp
Killer, reminder update and fixies
Merge branch 'master' of github.com:creckx/pcp