First functional version - 0.0.1
Merge branch 'master' of https://github.com/vssouza/maplink-dev-test