Merge pull request #1 from neerolyte/master

Master merged from svn trunk thanks to David Schoen.