more robust code
Merge branch 'better'