Fixed #69
Merge branch 'master' of https://github.com/joomlaworks/k2.git