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