Can now handle opening emoty files
Merge branch 'master' into layers