Merge pull request #2 from DrakoPD/master