RNDT: merge squash pullreq #18 by ddgis