Fix #46
Update change log
0.15
Merge branch 'develop' into stable