#290 Model was missing setShort()
#290 Implemented zeroToNull
#290 Javadoc