More fixes to #2 this makes it return a more reliable value and added a double usage for a dry set vs using stored vars. Documenation and test updated.