#238 Changes based on Qulice Rules

@yegor256 , I have to deleted everything from scratch. And finally I am able to commit. Please review and let me know if you find anything missing.