Issue 251 -

by Milan Milosevic
by Uros Komlenovic