Context rettet

close #3