initial commit
added sebastian's
fixed merge conflict with github