Merge pull request #64 from iazz/master