updates for CSAMA 2014
Merge commit '14ddb32ec7cfcdfd1a67e391c5c7ba4e0dfa5c8b'