Non-periodic tilings in 2-dimensions: 4- and 7-fold symmetries