optimize for ref #14
@Ignore
Merge pull request #62 from twillouer/issue14

Issue14