Minor changes to get cpal to import
Eliminate unneeded else
Merge pull request #2 from ktbyers/master

Minor changes to get cpal to import