-#145
Merge branch 'develop' of git://github.com/rensi4rn/GEMA-KPLIAN into develop