Merge pull request #24 from onaliugo/master

Various bug fixs, better set and get user's settings
Added back line to prevent 'null' loading