upadting links as well
merging and compiling changes from master