Merge pull request #54 from evdenis/master