minor changes
Merge branch 'hsandt-master'