Fixes
merge conflicts
Merge pull request #1 from Tejal011089/master

Trufil new development