updated version
merge
implemented return validation
working on docco