Bug fixes I think...
Merge branch 'dev'