Merge pull request #24 from DewiRS96/master

Updated