cleaned code and comments
Merge branch 'develop' into faultReport
Commented code