Fixed #4 - improved "context" processing