Merge pull request #37 from Shimmur/development

Minor fixes to dependencies and naming.