merged master and vincent

got ricardo's code working with kay's