Merge pull request #21 from DewiRS96/master

Updated