autoload option fix + merge with branch01