Merge pull request #1 from autolab2013/master

Pull to keep up with autolab2013