Fixed issues #1 and #2, obsoleted main_dev2