Implemented issue #3. Not that difficult actually