Fixed #13
Merged