added build for linux/mac
improve readability