move more from old version
Merge branch 'master' of github.com:Blahah/biopsy