Merge pull request #93 from mithro/master

Clean up and update dependency specifications