Additional changes by Damir Lacković

https://twitter.com/damirlackovic