sykorad Merge pull request #26 from dvoromar/updates