Fix for issue #33.  Also updated license notices on modified files.