Merge pull request #300 from vaites/master