Revert "Reverted some of 0b11522f2ccc170fde47af083d5c13e1df7876bb"

This reverts commit 18d98be849d63e5e4b3e0efb02ccf56212eec38b.

Now with safe loading in next commit
Safe yaml loading
Merge pull request #1481 from psav/master

Safe yaml loading