Merge pull request #2 from leandrorchaves/master

Added checking of the configuration file