trevphil Merge pull request #20 from duckietown-ethz/v1