Fix bug #78
Merge branch 'develop'