Merge pull request #7 from adlnet/master

Sync up!
Merge pull request #251 from andyjohnson/master

Sync up!