According to file
Merge pull request #1 from statshero/patch-1

According to file
Addressed following @statshero's 4/2/14 feedback, item no. 4.
Merge pull request #1 from Digital-Contraptions-Imaginarium/master

Upstream changes