#48 Minor changes in this issue