fixed setup.py and removed useless stupid stuff
increment version to 0.1.2
Merge branch 'development'