Merge pull request #24 from N-Pex/yakreader

Latest from master