Text: adding merge function with input
Merge branch 'develop' of git://github.com/tuttleofx/TuttleOFX into develop