Merge pull request #1 from mab1290/master

Merging changes to Kingsania