Issue #33 : Bug fixes