Fixed #1, #2

please make a separate or for this - 1 PR = 1 issue