Some cool feature

Check out those features!
Merge branch 'master' into users