Merge of https://github.com/octo-online/robospice/pull/185