Merge pull request #9 from EagleTM/master