fix last commit
Merge branch 'master' of https://github.com/mlisakov/Artis.git