small fix
small fix
Merge branch 'master' of git://github.com/dk547/halo
Merge remote-tracking branch 'origin/master'