Dev

Adding updates from dev branch