Pull request for Issues/28

Pulling from issues/28 branch.