Rename & bug fixes
Merge branch 'master' of https://github.com/jhl92/SPC.git