Merge pull request #22 from ellerh/implement-included