Merge branch 'master' of https://github.com/trajeta/doore_src.git