Merge pull request #12 from asyrkett/master

Aida's pull request