Merge pull request #19 from PoshSec/master

Updating development from Master