Merge pull request #65 from DrMarcII/master

Version 0.10.0-pre.5