Moving to dev
Merge branch 'dev' of https://github.com/skoulouzis/lobcder.git into dev