Review Young's part by ripe
Merge pull request #27 from ripeconan/develop

Review Young's part by ripe