+ fixed refs
Merge branch 'dev'