Fixed #15
Closed #14