Merge pull request #1 from stackforge/master

rebase 1