Fixed #93 in master