Added shortToLong and longToShort methods
Merge branch 'master' of github.com:Fingerpaint/project-code