GSoC 2014 Pull Request from VcamX