Bootstrap 2.3.0

Signed-off-by: Kwpolska <kwpolska@gmail.com>
Merge pull request #282 from Kwpolska/master

Bootstrap 2.3.0