Finished work for issue #3

All changes listen in #3 are now implemented.