Changes for linux
Merge branch 'master' of github.com:GadgetFactory/Papilio-Loader