syncing up with dev and master
merging intention from dev
updating version info
adding code from master