Merge pull request #10 from zinic/master

Fixing Output Calls
adding data layer and configuration management