Time to merge this fucker

merge daniel branch with master