Merge pull request #1 from ImpactFlux/master

b