Fixed #106
Working on #58