refactored parsing and bumped version