Fix bugs

Signed-off-by: Diwank Singh <diwank.singh@gmail.com>
Merge branch 'master' into gh-pages