Initial commit after import from Eclipse