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