Shimmin' it.
Merge pull request #171 from amida-tech/new-patch

Shimmin' it.