Update to latest changes on Dec 16, 2014 Version 1