Changes from bug 2 branch

Pushed to remote branch from local branch.