borrow and return tools
fix merge conflict
Merge pull request #18 from callapatel/crystal

Crystal