Close Issue #57
Merge pull request #58 from CodingForChange/bug_fix

Close Issue #57