fixes for kicstart of files
Merge branch 'master' of github.com:armoredsoftware/code