Merge pull request #251 from manolo/master

done