Hopefully fixed potential synchronization issue and added handling of invalid images
Merge branch 'master' of https://github.com/Andlon/sonetta