Minor bug fix; Add feature request