Merge pull request #400 from voidus/master