enhancements

Update is related to https://github.com/Link7/WPT/issues/5
Merge pull request #3 from deanearlbartolabac/enhancements

Enhancements