derp
Merge pull request #19 from Digikid13/meteor

derp
Merge pull request #105 from dscx/meteor

shawn