Merge changes from master to online branch

Merging changes from PR#47 from master to online branch