Roman`s branch
resolve merge conflict
added notes, completed coding
release 2 is now completed