Solved bugs in README documentation
Merged develop into master