Still debugging
Merge pull request #21 from edigotlieb/dev

Still debugging