Merge pull request #251 from andyjohnson/master

Sync up!
Merge pull request #8 from adlnet/master

Sync up!