Squashing Commits

Fixed version of #854