Merge pull request #27 from dittaeva/master