updated sdk to 2.1.6+23110, refactored parts of code, added todo fix bugs
built version 2.1.6