more simple nose test
Merge remote-tracking branch 'upstream/master' into HEAD
remove *v1.py
Merge pull request #4 from ibyron/master

remove *v1.py