Bug when pressing edit on CPC
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from ripflame/master

Bug when pressing edit on CPC fixed