mergefix
Changes to make the samples work in UNIX. However, it's broken right now