Updated to dev things
merge dev branch
added some features