implemented issue #15
added issue #14