Merge pull request #1 from HexSoftware/master

testing yay for automatic