Merge pull request #36 from anaselli/master

YSettings fixing and improvements