Merge pull request #105 from simensta/master

Updating working branch
sdoc gemfile change
fixing merge conflict
Merge pull request #107 from simensta/working-branch

Working branch