Updated with fix for issue #21.
Removed unnecessary import.
Merge pull request #22 from F1ashhimself/master

Updated with fix for issue #21.