fix
Merge branch 'master' of github.com:micktaiwan/scpm into factory_master