Merge pull request #7 from jaquerinte/version_2

version 2 with fixes ready