Add fix2 to feature 1a
Merge remote branch 'origin/hotfix/0.0.2'