updated copyright to 2014
merge with github