Merge to branch

getting github working still...