Initial commit
Updated readme
Merge master to develop