Refactored, model binding properties added
Regex attribute added
Comments improved
Merge remote-tracking branch 'origin/master'
Fixes #176
Fixes #178