Merged hotfixes from akbar and marco and bumped version to 2.0.4