Paul's changes, without whitespace-only changes
Merge pull request #41 from bscSCORM/bsc_paul

Paul's changes, without whitespace-only changes