Version 2.4.0

Version 2.4.0
Version 2.4.0

Version 2.4.0
Merge pull request #1 from jangilla/2.4.0

Version 2.4.0