Multiple bug fixes - Version 2.0.3