Feature/fault tolerance rake task

Don't merge before #47 
And don't merge just yet.