Dev -> Master

I guess I finally realized dev branch is useless. Let's hope people don't think master = final version.