added samples
IMPORTANT: Merge branch 'master' into osx
SEMI IMPORTANT: Merge branch 'osx'
cleaned up in wrappers