Fixed some bug
Merge branch 'master' of https://github.com/tajpure/tech-radar