Merged #25 PR