Merge pull request #10 from GlobalNOC/1.0.0-dev

1.0.0 dev
Merge pull request #12 from GlobalNOC/1.0.0-dev

1.0.0 dev
Merge pull request #14 from GlobalNOC/1.0.0-dev

1.0.0 dev
Merge pull request #15 from ajragusa/1.0.0-dev

1.0.0 dev
Merge pull request #17 from GlobalNOC/1.0.0-dev

1.0.0 dev
Merge pull request #18 from GlobalNOC/master

syncing 1.0.0 with master