Potential Fix for Problem A
Merge branch 'master' of https://github.com/gothed/sleipnir