things squashed here
Merge pull request #1 from k3dB/test_squash

things squashed here