Dropbox Merge

Merge changes from Dropbox to Github.