merge dev branch

improved mensa parser
small cosmetic changes
small fixes