Fixed #14 and supported #13