Merge pull request #33 from N-Pex/yakreader

Latest from master