parser refactored
Merge branch 'master' of github.com:/qhas/qhasd-rails