Merge pull request #1 from klout/master

merge from current into my fork