committin gissue 124
Merge branch 'master' into devel