Merge pull request #2 from sdsweb/Dev

you know we got it
Merge pull request #3 from sdsweb/master

Merge pull request #2 from sdsweb/Dev