Add #74 and #75
Small fix for TFS 0.3/0.4
Merge pull request #76 from ninjalulz/master

Add #74 and #75