Merge pull request #16 from GlobalNOC/1.0.2-dev

1.0.2 dev
Merge pull request #32 from gmcnaught/1.0.2-dev

Merge pull request #16 from GlobalNOC/1.0.2-dev