[issue #76] [DONE] fixed branch issues, work done