Merge pull request #12 from EagleTM/master