fixed bug
fixed service
added gitignore
merge from master