Created by: wasabideveloper
Implementation of feature #183 (closed) (Merge will close #183 (closed) ).
To be reviewed by: