Merge pull request #2 from keplerproject/master

merge from keplerproject/copas