refactored
Merge branch 'dev' of github.com:snwfog/ppedit into dev
CAP-132 #comment implemented. #close implemented issue CAP-132