Merge pull request #249 from manolo/master

done