Fixed slave methods and edited name in master
Merge branch 'master' of github.com:jsfr/PCSD-2013