a few changes
Merge branch 'master' of github.com:benklett/arch_package_ldm-server