Initial import.
Fix compilation issue with double class member.