Now keeps sample history
Merge branch 'develop'
Fixed cmake version flags
Merge branch 'develop'