Solved some bugs and updated README.md

Solved all bugs introduced by last commits (some of them caused on merge process) and updated documentation on README.md