Removed LOCK_NB for more reliability, closes #7