stephanenicolas/robospice — pull request #332 by nkeskinov (2014-07-07 14:36:12+00:00)
Title: Squashed version of PR 259

This is a ready-to-merge version of all commits regarding Pull Request #259.
Tests are passing locally. Should we merge?