Monday fixes v2.
Fixed my monday fixes v2.
Monday fixes v3.
Merge pull request #5 from lumikenterprises/calles-feature

Calles feature