Merge of the three different platforms repos
Base, Desktop and Android.
Merge pull request #5 from glidder/master

Los tres repos unidos.