New awesome features
Amazing merge