Using dict() construct for 2.6 compat (Fixes #42)