Samples are now parameterized
Merge branch 'master' of https://github.com/balidani/viking