Pull Request for Issue 29 + white-space removal