fix issue#2
Merge branch 'master' into development