Dev

Fixing issue #35 for HAL