0.0.4 - added code to catch race conditions
adding long test
resolving conflicts