Closes Issue #1

Besides add a bunch of merge commits, it removes the unused dependency.