Merge branch 'master' of https://github.com/pajcak/API_ADT.git