Implemented sollution as found in issue #13