Sid's changes.
Merge branch 'master' of https://github.com/iamadawra/calblueprintHack