Merge changes from original repo (Sep 18, 2013)