added simple unit parsing