Fix the -* bug
see last few commits
Merge pull request #16 from pickdenis/master

Fix the -* bug