nontas/antonakoscvpr2015 — pull request #2 by jalabort (2014-11-04 18:58:26+00:00)
Title: Mergeattempt

simple fixes