Fix python <2.7 dict comprehension error
Merge branch 'development' of https://github.com/localmed/pyserializer into development