-Fixed Issue #21
-Removed unnecessary dependency