Merge pull request #49 from callapatel/crystal

Crystal
lord
mergeing and working
Merge pull request #50 from callapatel/callap

Callap
Merge branch 'master' into crystal