bug 37 fixed
Merge pull request #39 from clutchwave/general-bug-fix

Issue #37 Fixed