[Issue #186] [DONE]