Merge pull request #1 from Marango/master

Pull 4/17/14 updates from master
Merge pull request #2 from Marango/gh-pages

Merge pull request #1 from Marango/master