Merge pull request from pyriana