fixing merge problems
Merge pull request #10 from kmjungersen/dev

fixing merge problems