Improving data management
Merge pull request #18 from Cbsoftware/master

Improving data management