Working

merge working branch to master