Merge pull request #1 from mcostalba/master

updating with the latest source