Merge pull request #52 from snowleopard/angerman-patch-2