Online ==>> Master

Merge changes from PR #24 in Online to Master