copyright to 2014
merge fix