some new changes
Merge pull request #5 from danvbe/sergiu-work

some new changes