Some last mile changes
Merge branch 'production' of https://github.com/nsclick/inalco into production
last mile changes