whitel Merge pull request #2 from whitel/master