Merge pull request #1 from adlnet/master

update fork with master
Merge pull request #2 from adlnet/master

merge master into fork
added Pankaj Agrawal to contributors
Merge pull request #278 from ljwolford/master

added contributor