iritkatriel Merge pull request #21 from iritkatriel/dev