Fixed issue #36 and extended the constrain validation and removed some timeouts