minor touchups
Merge pull request #181 from alshabib/0.11-DEV

minor touchups