revision merged into master

commit 29e6a63dbfbea7f6a4c38b085372a140c94ffe89
Author: Noel Delgado <auhcsei@gmail.com>
Date:   Thu Sep 11 01:33:47 2014 -0500

    revision