Merging 12/9/2014

Merging 12/9/2014