Fixed a few issues and added a new setting (version 1.5)