Merge pull request #1 from autolab2013/master

Pull to keep up with autolab2013
Merge pull request #2 from nathanlrf/master

Merge pull request #1 from autolab2013/master