Feature/fault tolerance rake task

Don't merge before #47