Added orphan filtering, closes #56