Multiple changes

Fixed Bug #14, Added feature #14