Merge pull request #375 from sergeyklay/master

Fixed bootstrap
Fixed issue: Removed dublicate function __()
Fixed issue: Removed not needed condition, added __n()
Fixed issue: Fixed PHPDoc