fixed unseriazable method
Merge branch 'dev'