Merge pull request #28 from sbeamer/master