[fix][fr]minor bug fixes
merged branch bghazy/patch-1 (PR #68)

This PR was merged into the master branch.

Discussion
----------

[fix][fr]minor bug fixes

Commits
-------

dc8bf1d [fix][fr]minor bug fixes