Merge #12 pull request