syncing with NEKTech_Linux_Shell-23082014

syncing with NEKTech_Linux_Shell-23082014