Merge development to master 7/25/2014