cleaning up
Merge branch 'develop' of github.com:dadepo/jprowork into develop