Added changes suggested between @ibara and @mmstick.

Closes #279