wip almost there
Merge pull request #15 from mmoscosa/develop

wip almost there