Merge Development into master 10/9/13