1.0.1.6

Several bug fixes