Updated za
Merge pull request #26 from zerious/master

Updated za