Merge pull request #247 from manolo/master

done