Merge branch 'master' of github.com:vityok/clsql into fix-atol64