Merge branch 'master' of https://github.com/Andris91/SDI.git