Merge pull request #6 from notnownikki/master