Updating is working,
Merge branch 'master' of https://github.com/Elejdor/pk_2014
Some safety changes,