Fixed inline for Apple OSX Darwin
Merge branch 'osxfix'
fix conflict
Merge branch 'areggiori-master'