added setup.py and cleanup
Merge remote-tracking branch 'misha/master'