Merge pull request #19 from i-c0112/master

1_2_0_RC