#42, #63 issue resolved!!!
Merge remote-tracking branch 'origin/develop' into 1.2.1