Merge with master branch

fixes the #214 issue