I prefer the #2. However, for this happen, https://github.com/numenta/nupic.core/pull/86 should be merged too.