Issue #16: Removed dependancy