Merge pull request #28 from Caf131/master

Pull Request