Merge pull request #377 from zorun/master