merging master and dev branches