fixed typo and support shell functions