Once more with feeling.
Merge pull request #3 from spatzkatz/BranchTake2

Once more with feeling. fixes #