version number and todos
Merge pull request #13 from teresan/develop

version number and todos