Merge pull request #34 from callapatel/crystal

Crystal
nothing relevant
Merge branch 'master' into callap
styling
Merge pull request #35 from callapatel/callap

Callap
Merge branch 'master' into crystal