Updated version
Updated Samples and EXPORTS