Merge pull request #428 from virtulis/master