Accept changes 4/10/14

Attempting to catch up to Master