initial commit
Dependency points to Viking now
Merge branch 'master' into development