Combine parse functions and add null values for userModel string interpolation
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
Merge pull request #83 from gitMbar/dev

Combine parse functions and add null values for userModel string interpolation