Issues/34 offline mode