Fixed loader to use Yaml mapper for yaml files
Merge pull request #678 from olensmar/develop_2.0

Fixed loader to use Yaml mapper for yaml files