nik01010 Merge pull request #31 from nik01010/rel/v1_1_3