Merge pull request #15 from adlnet/master

Sync up!
Heather Edits 4.1.6 to 4.1.12
Merge pull request #295 from andyjohnson/master

Heather Edits 4.1.6 to 4.1.12