Second commit
Merge https://github.com/taquimon/LinkSimAndroid
Merge https://github.com/taquimon/LinkSimAndroid