Merge pull request #2 from medseek-engineering/master

Sync repo.
Merge pull request #1 from fwestrom/master

Merge pull request #2 from medseek-engineering/master