Merge pull request #2 from munkireport/wip

Wip