minor changes
Merge branch 'pr/9'