Merge pull request #14 from EagleTM/master