Added negative handling
1.0.1