fixed more most vexing parses
Merge branch 'develop'