some changes... check them out
Merge pull request #14 from danvbe/sergiu-develop

some changes... check them out