Added make -j support