Fix #6
Close #7