Fix for Issue #6
Merge pull request #7 from emmanne08/2-0-stable

Fix for Issue #6