Merge pull request #1 from mab1290/master

Merging changes to Kingsania
Merge pull request #2 from Kingsania/master

Merge pull request #1 from mab1290/master