added changes from mac compatibility into development file
Merge branch 'master' of https://github.com/adasilva/journal2ebook