Updated: Dependencies and small cleanup.
Merge pull request #10 from liip/update-dependencies

Updated: Dependencies and small cleanup.