Added more constraints checks
Pushed version to 0.0.114