Merge branch 'master' into develop

* master:
  merging master
  Initial commit
added measurements to readme
updated readme with measures and proper markdown
Merge branch 'develop'

* develop:
  updated readme with measures and proper markdown
  added measurements to readme