Version 1.2

Fix issues