untangled 2017-04-25

@wilkerlucio Many thanks. I will look at it.