Updates for audit 2014-05.
Merge pull request #8 from eric-wu/master

Updates for audit 2014-05