conao3 Merge pull request #7 from conao3/feature#6