Added basic platform-specific compilation
Resolved merge conflicts