Merge pull request #88 from N-Pex/yakreader

Merge from master