updated for bug fixes

April 2014 release
updated master main