Version 2.40.04
Merge pull request #17 from Quackmaster/dev

Version 2.40.04