Merge pull request #1 from evildmp/master

Pull from Daniela's master branch