Merge pull request #1 from jdmalia/master

Pull from update on 4/8/14