Online ==>> Master

Merging changes from PR#26 on Online to Master.