Merge Development into master 10/11/13