Merge pull request #481 from zorun/master