Merge pull request #339 from Seak/master