updated with small fixes for 2014 release