Merge pull request issue #2 - Expansion Warning

closes #2