Fixed issue #21 and updated copyright comments