Updated missed conversions
Merge pull request #2 from jboever/development_conversion_update

Development conversion update
Revert "Development conversion update"
Merge pull request #3 from jboever/revert-2-development_conversion_update

development conversion update