Merge pull request #11 from nordsieck/t

Move to dev box
Make tests pass