Fixed #6, update regarding to #7