Merge pull request #193 from percyfal/master

Hotfix - fix incompatible parsing order for old samples. Fixes #192.