merging small changes
Merge branch 'master' of https://github.com/Cheex11/drafter

msg