changed small bits for more robustness
Merge branch 'master' of https://github.com/hashme/thistle