Fixing couple of bugs
Released v1.1.4