20140603 submit from spdbak2
Merge https://github.com/JamesIllusion/WorkSpace