Issue #35

Issue #35 
Message auto load