Merge pull request #211 from zedgu/master

Fix #196 #207 (Removes some un-needed calls to tls/crypto)