Merge pull request #2 from skurfer/master

Abracadabra cleanup