ensure parameter first
Merge branch 'master' into lint_cleanup
Merge pull request #4 from jlambert121/lint_cleanup

Lint cleanup