Updated Licence text
Added numpy include dirs in setup for windows compilation
Merge branch 'master' into devel