Merge pull request #74 from ln5/master

Seems borken since the polarssl addition; doh - my local change was unsynced, you win the race to fix this issue.