Source clean-up. Added documentation in readme
Merge remote-tracking branch 'origin/master'