tubalmartin Fixed issue #45