First Push
Misc bugfix
Configuration load issue
Merge pull request #1 from pruno/develop

First Push