Updated dev to master state so we can move on :)