Merge pull request #22 from rmokiem-topdesk/master

More fixes and updated with latest upstream code