Closed #193
Working on #192 #178