add license
Make setup.py more friendly
Move tests
Merge branch 'master' into develop