Closed #37
Working on #191 #184