conao3 Merge pull request #18 from conao3/feature#17