Fixed [issue 11]