NickColvin updates

ae20c51

Feb 20, 2016

updates

ae20c51