Source updated

Source Updated for Windows, Linux and Mac