#256 excludes made platform independent
Merge remote branch 'fork/256'