changed setup.py version number
package parsing in setup.py
changed version numbers
Merge branch 'dev'