Merge pull request #10 from RPI-UPE/fall13

Fall13