Add changes to avoid dataset comprobation before parsing data
Closes #96
Merge branch 'bugfix-#96' into web