making parsing a bit smarter
push version
Merge branch 'fix'