Fixed some issues caused by a wrong branch
Tagging new stable version