minor changes
merge
Merge branch 'master' of https://github.com/dconstructionx/learning_local_net