Version 5.

Changes made to support Eclipse.