20140810 Changes

Commit the latest changes from local