Version 1.8.1 - several bug fixes