Merge branch 'develop'
Version bumped up to 0.5
Merge branch 'master' into develop
Fix test failure in Python 3.3
Fix functional tests error in Travis-CI