~ adjusted sources to be runned on both linux/macosx.