Merge pull request #27 from sbeamer/master