Fix for compile errors (issue #3)