initial commit
fixed merge from github nonsense