Prototype ready
Merge pull request #6 from tiagom87/tm_mods

Prototype ready