fixing
Merge branch 'master' of https://github.com/Neodamus/epoch-test