Made checking of values cleaner with underscore
0.1.3