issue #93 done. Changes made to header