Merge pull request #450 from JoshMackin/master

fixes #428
#414, info now delivered to those in need