Merge branch 'develop'
Merge branch 'develop'
2.0.5 release
Make it work with python 3.3
Manually merge pullreq #4 due to mistarget