ChiliProject 3.4 compatibility
Merge branch 'chiliproject'
Version 0.1.0