added test_s1
Merge branch 'master' of github.com:nens/python-subgrid