More logic added
Merge branch 'master' of https://github.com/lf94/hywa