Merge pull request #15 from exander77/master