Rewrite

Let's merge dev with master then merge this with dev.