Addressed issue #120.
Back to old state.
Merge pull request #121 from simongog/issue_120

Issue 120