Merge state

Merging merge state and master branch