Tapkee update
Merge pull request #1090 from iglesias/feature/tapkee_update

Tapkee update