Merge pull request #243 from tomkralidis/master

refactor dependencies