Merge pull request #1 from Marango/master

Pull 5/6/14 updates from master