Fixed #15
Done #14