fix
fix
Merge pull request #12 from surangak/on-load

On load