Fixed issue #2

I also adjusted the dependencies and removed some backup files that don't belong in a repo.