updated some things
Merge branch 'master' of github.com:konklone/konklone