Adjustments to code completion for issue #32
Merge pull request #42 from michaellwest/master

Adjustments to code completion for issue #32