Fix typo
Merge pull request #436 from andrewisplinghoff/master

Fix typo
Merge branch 'master' into develop