Merge branch 'release/0.4.1' into develop
Remove ordereddict requirement for python 2.6
Update version.
Merge branch 'release/0.5.0'