Fix for Issue #80

Refactored from object to IModel<String>