Merge pull request #18 from DewiRS96/master

Pull Request