Fixed #20. Fixed #16