fixed new bugs
Merge branch 'master' of https://github.com/mpanibrat/devclub
fixed new bugs