Changes made by Jure Kenda (jurekenda@yahoo.com).
Merge branch 'master' of https://github.com/luxxi/shakal.git