Changes by Kris
Merge pull request #1 from khamoud/master

Pull Request by Kris