Removed Oneshot
Merge branch 'master' of github.com:felixsch/moonbase-test