Merge pull request #16 from EagleTM/master