Added feature

See changelog