Load state fix
Merge pull request #16 from MarcoGiuriato/devel

Load state fix