Hotfix 0.1.1

Master with first hotfix added