Fixed #90, fixed #94, fixed #100