fix for #5
fix for issue #7
Merge pull request #8 from Brackets-PHP-SIG/issue-7

fix #7 and #5