Merge pull request #80 from eaescob/master

updated changelog and new ssl mitm cmd line options