Some new stuff for this branch
Merge branch 'new-feature'