Merge branch 'release/0.2.3'
Merge branch 'stable'
fix setup.py
Merge branch 'release/0.2.4' into stable