Merge pull request #4 from marcel-blonk/develop

Intermediate attempt at pulling in dependencies