Fixed abbrev. bug
Merge branch 'master' of https://github.com/ercgn/11411-proj