committing changes from Branch to Master

branch-201309180600 to Master Branch