closes #59
Merge branch '#59-splitter'