Remove Expand from import
Require clean before compile
Merge pull request #100 from gtakata/DEV2.1

Dev2.1