Merge branch 'development' fixed #9 again