Replaced static call to self
Merge branch 'master' of github.com:lucifurious/kisma