basic features to support the first few example tests
Merge branch 'master' of https://github.com/Trindaz/santos