Bugfix
Merge branches
Updated readme
Updated readme
Updated readme
Updated readme
Merged into master