small changes
Merge remote-tracking branch 'origin/master'
complete cleanup, removed old version