nf Merge pull request #3 from needto/master