Multiple subscription improvements. Closes #27