Merge pull request #2 from jkugler/master