copy paste some stuff from old branch
fix conflicts
Merge pull request #4 from nclundsten/merge

Merge xerkus dev branch