Fixed connection - #FIXME get from conf
Merge branch 'master' of http://github.com/toff63/kathaton