merging dev changes 1/12/2014