[BugFix] Changed fromString() method

Fixed string comparison methods in order to be more proper/accurate.
From == to .equals()