Marango/Make-it-Connect — pull request #2 by Marango (2014-05-06 19:51:14+00:00)
Title: Merge pull request #1 from Marango/master

Pull 5/6/14 updates from master