Issue fix  dev master 1.0 (#14)

This is the pull request that you need to accept ..