update tree with the master branch 23082014

syncing from master NEKTech-Labs branch.