Final version
Merge branch 'master' of https://github.com/anpar/1243