Modifications to startup.
Merge branch 'master' of github.com:recri/keyer
Merging the master.