made some additional changes
Merge branch 'iss53'