Sandi's Changes
Merge pull request #12 from sandimagithub/master

Sandi's Changes