merged and fixed some stuff.
Merge pull request #32 from brain-murphy/brian

merged and bugs