Merge pull request #4 from erasmospunk/master

Small fixes
Tighten up try/except block to match neighbouring style
fix issue with objects as values and some unicode characters