Working on #138
Closed #138