Few updates due to bugs fixing and new features
Merge remote branch 'origin/master'