use __all__ to fix backwards compabitility issues with import issues.
Merge remote-tracking branch 'csky/master'