Merge pull request #978 from gzm0/export-all

Export all
Fix #980: Protect from exported method and property conflict