Master

I messed up git and so I had to make a new request... sorry folks.

This includes the specs and stuff though.