Fixing a false definition and putting class deklaration in header #142