Partial fix
bug fixed and added description
Merge remote-tracking branch 'origin/gh-pages'