Some refactoring
Fixed #38, had to increase min api level
Merge branch 'i38'